From 2b5cab716c10641a8f25e7b612ad19b5b8d93f05 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Mon, 23 Mar 2020 10:59:35 +0000 Subject: [PATCH] Add disco and eoan as supported architectures Last-Update: 2019-04-21 Gbp-Pq: Name ubuntu-eoan-distro.patch --- clang/include/clang/Driver/Distro.h | 4 +++- clang/lib/Driver/Distro.cpp | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/clang/include/clang/Driver/Distro.h b/clang/include/clang/Driver/Distro.h index 7b34a0925..c20d0175a 100644 --- a/clang/include/clang/Driver/Distro.h +++ b/clang/include/clang/Driver/Distro.h @@ -62,6 +62,8 @@ public: UbuntuArtful, UbuntuBionic, UbuntuCosmic, + UbuntuDisco, + UbuntuEoan, UnknownDistro }; @@ -115,7 +117,7 @@ public: } bool IsUbuntu() const { - return DistroVal >= UbuntuHardy && DistroVal <= UbuntuCosmic; + return DistroVal >= UbuntuHardy && DistroVal <= UbuntuEoan; } bool IsAlpineLinux() const { diff --git a/clang/lib/Driver/Distro.cpp b/clang/lib/Driver/Distro.cpp index 2c4d44faf..6f3988276 100644 --- a/clang/lib/Driver/Distro.cpp +++ b/clang/lib/Driver/Distro.cpp @@ -50,6 +50,8 @@ static Distro::DistroType DetectDistro(vfs::FileSystem &VFS) { .Case("artful", Distro::UbuntuArtful) .Case("bionic", Distro::UbuntuBionic) .Case("cosmic", Distro::UbuntuCosmic) + .Case("disco", Distro::UbuntuDisco) + .Case("eoan", Distro::UbuntuEoan) .Default(Distro::UnknownDistro); if (Version != Distro::UnknownDistro) return Version; -- 2.30.2